Merge "Only let app generate progress when client side using DecorView" into main