Merge "Bugfix: PIN keyguard is clipped in Car" into pi-dev