Merge "Fixed a bug where the background could become transparent" into lmp-mr1-dev automerge: 8f51c4c
automerge: 2e34adc

* commit '2e34adc24c9609426d08530b1c5bbec723bd4a19':
  Fixed a bug where the background could become transparent