Merge "Updated demos to remove indicator where appropriate" into devel/master