Merge "Patch npe in TaskbarAllAppsController" into tm-qpr-dev