Merge "Make system bars appearence logic more generic (3/N)" into sc-v2-dev