Merge "Fix two bugs with thumbnail screenshotting for split apps" into udc-qpr-dev