am d56352db: am c79a8ea0: Merge "Resume home activity can skip resume and...
am d56352db: am c79a8ea0: Merge "Resume home activity can skip resume and cause ANR. DO NOT MERGE" into lmp-mr1-dev
automerge: f6ab9afc -s ours
* commit 'f6ab9afc':
Resume home activity can skip resume and cause ANR. DO NOT MERGE