Merge "Fixed an issue that activity might be invisible after unlocking." into qt-dev