Merge "Avoid resuming activity before launch." into mnc-dev