Merge "Move insets out of edit text background" into lmp-dev