Merge "Switch to recyclerview in ManageApplications"