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

Change-Id: Id9dcf659dce0f7bb9385cde17f9c929beb89d96d