Merge "Refactor the methods for changing the on-screen indicators." into gb-ub-photos-bryce