Merge "Refactoring of ASS.startActivityUncheckedLocked."