Partial rollback of I9ebc92dc

 Bug: 5239166
 Turns out nativeRecordButtons is necessary even if we are not
 using the native selection rings.

Change-Id: I8e7713928b77c0098640b51ce8e8815dad0c9545
1 file changed