Merge "Controls popup background" into sc-dev