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

Change-Id: I47a54efbdbcb2b052cd4ba04881630109bd7dd52