Merge "Add new SysUI flag for dock refactoring" into tm-qpr-dev