Merge "TaskbarViewController should only translate on rotation if icon is aligned with hotseat" into tm-qpr-dev