Merge "Not showing facelock when plugging/unplugging fixes 5438524"