Merge "Fix app battery usage list launch incorrect works app" into tm-qpr-dev