Merge \"Reinflate primary action mode view after detach\" into nyc-dev
am: 82f2df6108

Change-Id: Ic6def2b3eb5e654b028d11773a9527f01943289d