Merge "Allow security controllers to be used in other fragments." into sc-dev