Merge "Fix NPE for user aspect ratio button in multi-window" into udc-qpr-dev