Merge commit '9073dc69b110cbd0d4bebd128ed6cc2b24a16695' * commit '9073dc69b110cbd0d4bebd128ed6cc2b24a16695': Expand apps' control over the settings restore process
Merge commit '9073dc69b110cbd0d4bebd128ed6cc2b24a16695' * commit '9073dc69b110cbd0d4bebd128ed6cc2b24a16695': Expand apps' control over the settings restore process