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

Change-Id: I712344966dfe02a647e5751c9741c6677e414f6e