Merge "Fixed issue where background wasn't rendered behind customization tray" into honeycomb-mr1