Merge "Fix that the empty shade view would be visible sometimes" into pi-dev am: 866b4de28f
am: e02ed610a8

Change-Id: I50979e987a33780c776a136dcd1eba863bea69a7