Merge "Do not hide keyguard message when fp" into pi-dev