Merge "Fix testAllAppsFromHome failure" into udc-qpr-dev