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