Fix capabilities not getting updated on mode switch

Change-Id: If331e3733c08b4e520352cd323e9cd99565a0145