Merge "Reinflate primary action mode view after detach" into nyc-dev