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

Change-Id: I6643680a6c765f92f5c4e0e5fd77ee44356cac52