Merge changes Ie59ed72c,Ie763a2a6,I7f830e5c,Ife637438 into nyc-dev am: fe1886f
am: 843fcb0

* commit '843fcb079ec1d3aae6a431af57530dfa2d385552':
  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: I27ed2e95a43b77e45aa15a7ae1de9c54c4a0d78e