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

* commit '6521be4f9272d12f907108d871a79852ce9e6183':
  Fix for transparent CustomContent screen (issue 11549096)