Merge "Update customize button title when state changed" into rvc-dev