Merge changes If771fbea,Ib213cf3c

* changes:
  No longer close cursors manually after onLoadFinished is called.
  FAB now properly scales in multiwindowed mode.