Merge "Fix the clicking issue of restricted info icon"