Merge "Ignoring activity config changes." into jb-mr2-dev