Merge "Fix Beam Share preference on policy change"