Merge "Inset the non-overlay contextual action bar without a status guard" into lmp-dev