Merge branch 'bug/JAL-2600resizeflicker' into develop