Merge "Fix BP disappear when devices change to unfold mode from fold mode"