Merge "Fix the bug of not showing lock screen before entering Smart Lock page." into rvc-dev