Merge "Revert "PSS: Make sure shade is dismissed when starting the app ..."" into udc-qpr-dev