Merge "Allow force resize message activity to be resumed" into oc-dev am: 8cb56d9082
am: 1f06e4582c

Change-Id: I48b02adeb9da4c7c3f0149812fd44ffbd2eb45f1