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

Change-Id: I0bcee1d1f62c580f5c77e609154be1f24fd1c4bb