Merge "Log taps on PS container buttons" into main