Merge "Do not use isResumed()" am: b99211257a
am: 1722f5bd03

Change-Id: I76615c4c7200caec57960cbd281fff0328824cac