Merge "Remove nativeRecordButtons" into ics-mr1