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