Merge "Fix Tapl drag to folder issue on S5 and R3" into tm-dev