Merge "Inline slider with header" into pi-dev
am: 666ee4fa14

Change-Id: I16c56185628f7dde2a8dbd04bd4b8509163a2fbe