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

Change-Id: I15ea1ad47d41b6c0a8722dd13a1164a8c42c1805