Merge "Making sure shade doesn't open after unfolding when no security is set" into tm-qpr-dev