Merge "Change ActivityView startActivity state sequence" into lmp-mr1-modular-dev