Merge "[Settings] Code refactor for availability session"