Merge "[2/n] Optimize user aspect ratio button heuristic" into udc-qpr-dev