Merge "Resolve boot unaware for suspension details activity"