Merge "Avoid strict mode violation in shortcut manager on user-unlock"