Merge "Remove framelayout to make focus don't have duplicate action"