Merge "Make ListActivity handle insets properly" into main