Merge "Set initial focus list for additional permissions" into sc-v2-dev