Merge "Removing unnecessary textfield_active assets Bug: 5094669"