Merge "Fixed a bug where the background could become transparent" into...
Merge "Fixed a bug where the background could become transparent" into lmp-mr1-dev automerge: 8f51c4c5
automerge: 2e34adc2
* commit '2e34adc2':
Fixed a bug where the background could become transparent