Merge commit '2d19a676860bf773c984315fe03d9568913f9314' * commit '2d19a676860bf773c984315fe03d9568913f9314': Fix #2999258: ANR in Settings after every reboot
Merge commit '2d19a676860bf773c984315fe03d9568913f9314' * commit '2d19a676860bf773c984315fe03d9568913f9314': Fix #2999258: ANR in Settings after every reboot