Merge "Move buttons out of LogAccessDialog ScrollView" into main