Merge "Ensure template match_parent" into sc-dev