Merge "Update Policy transparency dialog layout" into sc-dev