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

Change-Id: I069bc9bbbdd50046d14faac46ea6965c512d8a28