Merge "Use view layouts rather than compositing an image" into sc-dev