Bug: 22219203 Change-Id: Ic920621baf769032475da32ea425097aafa0922e
Bug: 21879473 Change-Id: I0d2f839c525d2a5179f9ef59ab12a94f1aab9b6f
This makes the lifecycle simpler to fix a crash after rotation. Also do some adjusting of alignment while here. Bug: 21444336 Bug: 21205689 Change-Id: I67eccf4833f53b5e5088ae5e6038d041e8653565