Merge "Add back Fast Pair MainSwitch logic"