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

Change-Id: Iaf3051a1edf2af203bc712e9f58cc61d7cd5ddaa