Merge "Add custom scrollbars to the default device theme" into cw-f-dev
am: faf09eaa40

Change-Id: Iaf21cc52a4c678be6bb31cfdeb64d79b8b8b32f5