Merge "[Settings] Adjusted the API of Settings app" into tm-dev