Merge "Reset AndroidBeam Send UI flag"