Merge "Resume home activity can skip resume and cause ANR. DO NOT MERGE" into lmp-mr1-dev