Merge "Add proper padding to PerfTestActivity" into main