Merge "Fix missing early return." into ub-launcher3-qt-dev
am: 76696be287

Change-Id: I8e2c76cf42f52a0f16f996f1cf7bdb016eb77c66