Merge "Wait for scrim animation before showing lock icon" into qt-dev am: 75949d3d8d
am: 2b358bc10d

Change-Id: I4a59d14a122a0bc2e70558f9cc8d021b8ace12e2