Merge "Ensure side fingerprint sensor overlay shows above all other content." into sc-v2-dev