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

* commit '202e4fdafb5e4e94dd925905c1553bd92e61985e':
  Fix for transparent CustomContent screen (issue 11549096)