Merge "Merge "Remove isAppStartModeDisabled binder entry point" into sc-v2-dev am: 0cace4f3 am: 596c1d7b"