Merge "Allow force resize message activity to be resumed" into oc-dev