Merge "Ripple to header and button when click happens" into main