am 2dc25b18: am 202e4fda: Merge "Fix for transparent CustomContent screen (issue 11549096)" into jb-ub-now-jolly-elf

* commit '2dc25b186ed0ddbcb117ed8b70409ee467ab2e9a':
  Fix for transparent CustomContent screen (issue 11549096)