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

Change-Id: I80f1aa56145ea12001942c57161305b3fcdcc226