merge in jb-mr1-factory-release history after reset to jb-mr1-dev
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: Iff4148b0409ebaeb03ffb6998ce9624623c9c180
remove padding on table, also lifecycle cleanup.

Bug: 7195054
Change-Id: I1270642fc19c9ccc5fe19fbf395f729371d0ee94
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/packages/screensavers/PhotoTable into 1.1

Android 4.2.2 release 1