Merge "Added strings used by car keyguard overlay" into pi-dev