Merge "Shortcuts alpha should only react to shadeExpansion when on Lockscreen" into main