Merge "Update Android Beam screen layout"