Merge "End transitions before starting new transition." into qt-dev
am: 2f9ad0c42e

Change-Id: I29f8305dcf25a96551cac1c905ab74beb2b75679