Merge "Fix some incorrect dirty optimizations" into androidx-main