Merge "Fix Android Beam toggle switch on Manta." into jb-mr2-dev