Merge "Fix page indicator tint" into sc-dev