Merge "Update App Header buttons background/ripple to spec" into main