b/3362680 fix up register/deregister for AllInOneActivity

Also fixes back stack for up key

Change-Id: I8f789db685e352eaf1172bc7e1712c34476e2c4f
3 files changed