Fixed the flickering of the corners when collapsing the shade

Previously the header was flickering as soon as the collaping
approached the top of the shade.

Fixes: 150177399
Test: visual
Change-Id: I84f3f66d2527b13e541c99c106492518a063a5d4