Merge "Make sure settings writes are permission checked correctly" into jb-mr1-dev