am ac9abca0: Merge "Cleaning up some code related to background alpha. (Bug: 5512761)" into ics-mr1

* commit 'ac9abca0242a5bfe4c40d2d7b43efc10f26d2f5f':
  Cleaning up some code related to background alpha. (Bug: 5512761)