Merge "PSS: Make app chooser always fully expanded" into udc-qpr-dev