Merge "Remove app provided custom views" into main