Merge "Change visibility modifiers of MAXIMUM_BAR_VIEWS"