Merge "Monitor screenshot shelf view for outside touch events" into 24D1-dev