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

Change-Id: I2f8e2cbf9ec63090f850bb1060e514fa3dd27dc9