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

Change-Id: I47692dcaef58641e1fbf6632cfb59d843c43d667