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