Merge "Lock screen message alignment"