Merge "Clear up authorization state docs" into sc-dev