Merge "Match keyguard and regular status bar height on large screens" into tm-qpr-dev