Merge "Various custom flow fixes." into ub-launcher3-qt-dev
am: 07c96496b0

Change-Id: I8e6513bcc1b9ecf7b54deb6130272b1dd246b754