Merge "Update space around expanded state to be 4dp instead of 8"