Mobile rules mismatch

[zippy1978]

On mobile (rules starting at 500 ), rule ids are not sorted as they should.

On Android: a same rule with 2 implementations (xml and java) don't use the same id, but they should.
Example: EC546 is the xml version of EC520 (power save mode awareness).

On iOS: some rules do not have the right id (coming from initial Android/iOs rule numbering mismatch).
Example: EC523 swift should be in EC522 (brightness override).