Merge "Prompt for mode setting only if setting is available" into nougat-cts-dev