Merge "[Settings] Move mobile data template out of framework" into rvc-dev