Merge "Fix biometric content overlap with top/bottom bars" into sc-dev