Merge "Fix NullPointerException at ManageApplications$ApplicationsAdapter.access" into tm-dev