Merge "Allows IndicatorView to have a different size than Settings Activity" into rvc-dev