Merge "Support individual lock task features" into ub-launcher3-qt-dev
am: 293d964024

Change-Id: I2a53a5633d4d65ecc1ed2f9d78a7f18d749a82a6