Changes for settings to Androidx app move