Merge "FooterView color logic cleanup" into sc-dev