APD-542: reset filter layout fix
Merge branch 'APD-542' into develop