Merge "Maintain restrictions when downgrading system apps" into jb-mr2-dev