Merge "Allow performShowLocked when transition animation started" into nyc-mr1-dev am: 1fb9466c1d
am: 2261bb362b

Change-Id: I92ea546d7f197c2f5c8dc6e0b00f88f48274fdaa