Merge "Fix 3061025: Extend wave lockscreen timeout while grabbed."