Merge "Fix divider dismiss position wrong on potrait" into tm-qpr-dev