Merge "Additional logging for dropped shade touches" into main