Merge changes Ie59ed72c,Ie763a2a6,I7f830e5c,Ife637438 into nyc-dev
am: fe1886f8
* commit 'fe1886f8':
Should not update initial state at all on resize.
Adding logging to track down bitmap issues.
Moving the background to the window.
Adding clear-all button.
Change-Id: I18865c7e916863138a3e8ab36b5e594ed92bc666