Merge \\"FloatingActionMode: Fix screen coordinates.\\" into nyc-mr1-dev am: 3b8e0fdf92
am: c749762107

Change-Id: If82be88fcf267aef7f239e9ab30e3e594fcf945e