Merge "NSSL - Only apply y translation when on keyguard" into main