928fc8d1e2
* This caused the shape to not match the window size on app close. Bug: 123900446 Change-Id: Iaa2c06f19c535f72ae4c080b4bc847d336f1a77d