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

Change-Id: I149ed056de99bcb72c186c8c970cbef5d4f6c54f