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

Change-Id: I4d4fca8ed694827d3090b97869fc8eb6bec22fca