Merge "Hide esos setting if no app provides esos functionality" into sc-dev