Merge "Per-app config for split screen aspect ratio" into tm-qpr-dev