am eb512e90: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'eb512e90':
  Fix a deadlock involving BatteryService.
  Don't disable multi-user widget when Device Policy is enabled.
  Lock the screen while dreaming after the appropriate timeout.
  Ensure that dreams show while docked.
  Coordinate screen on with the window manager.
  Revert "Updating Roboto fonts with updated Cyrillic glyphs and fixes to tabular numerals. Bug:7198855,7070912"
  Revert "Updated Roboto fonts with correct T comma accent encoding"
  Fix upgrade case for Settings.Secure.USER_SETUP_COMPLETE.
  Lubricate a sticky notification panel.