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