Merge "Check for stopped state after launching AlwaysExpandActivity over the main activity in addition to paused" into main