Merge "Revert "Long press Lockscreen status bar expands the shade"" into main