Merge "Avoid making post state to RESUMED for a PAUSING activity" into qt-dev am: ae80cf399a
am: 026aacbe71

Change-Id: I3b852a8cb9b11592a75c979d73c2bfb2e8994b6e