Fix expanded desktop options
credit @Owain94 !

Change-Id: Iaad557f917f35ddccf6e9c13032051cb5d4d4a3f
Revert "[Revert] Notification drawer: full swipe to switch detection (2/2)"

This reverts commit fdca63acf33ec9bf2dfb45ca905884403c647b0f.

Change-Id: I39afa09f31435e5827143f2bc7fd7d3430dee179