Merge pull request #11525 from t895/runtime-switch-fix Android: Fix settings being editable when marked otherwise
