Merge "Fix invalid size in intent resolution filterApprovedApp" into sc-dev