Merge "Align taskbar children to Y value instead of X." into tm-qpr-dev