Merge "Fix potential issue where sub info change listener is not registered." into rvc-dev am: f0d5687181 am: 16a9b71f2c am: ad75b1e88b am: cd4ec69214
Change-Id: If08263f051bdaac1c37e487310c6189f7b55127a
This commit is contained in: