Merge "Fix activity NPE when clearing flags" into sc-dev