Merge "Shorten bitmap duration for debugging" into main