Merge "Update label loading logic to use intent-filter as sublabel for apps holding the right permission"