am 284f3128: am f7f24996: Merge "Fix issue 3426489 Overlay background changed when exported" into honeycomb

* commit '284f3128fa959c8c2aa901d0af359f1f1b4d8bc4':
  Fix issue 3426489 Overlay background changed when exported