Merge "Fix broken keyguard in car sysui" into sc-dev