Merge "Fixed disappearing customize button"