Merge "Do not preserve settings changed by 'android' package" into rvc-dev