Fix lingering blur issue with HUN with inline reply over occluded app.

Also, reverts earlier fix that introduced QS shade expansion issues.

The root cause is that QS expansion state is incorrect when split shade is enabled.

Flag: EXEMPT bugfix
Test: verified manually
1. Original issue
 a. Lock device that supports split shade
 b. Launch camera over lockscreen
 c. Receive HUN with inline reply action
 d. use inline reply action
 e. go to bouncer to authenticate
 f. go back to camera with pinned HUN over it
 g. camera app is not blurred.

2. QS expansion issue
 a. open launcher in landscape mode (split shade)
 b. the following actions are done without a pointer up event in between them.
 c. pull down shade from top
 d. collapse the shade completely
 e. pull down shade again
 f. both QS and notif shade should be visible.

Fixes: 422653382

Change-Id: Ie39ac067f932039c44ea96c6afb7cfce6c8b19ee