Merge "Add indicators of settings on the viewfinder." into ics-mr1