Merge "Improve scalability of Settings deep link API" into sc-v2-dev