Merge "Don\'t throw away wallpaper bitmap just because we are hidden. am:...
Merge "Don\'t throw away wallpaper bitmap just because we are hidden. am: ed0e1a68 am: 11e0c882" into nyc-mr1-dev-plus-aosp
am: 23d3b56b
* commit '23d3b56b':
Change-Id: If01ef5d8e30de8e4d9ea179e65a13a94e9289ada