Merge "[1/n] Aspect ratio settings app list refinement" into udc-qpr-dev