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

* commit '7c79e5dc819b08f544a53f7f300c033280755c7f':
  Fix for transparent CustomContent screen (issue 11549096)