* layout optimization
* keep screen on during picon import
Revert "* small layout improvement for service_list_item (a little more space for the now/next start time)"

This reverts commit e5308d9d68f7a4d275c865543f88fe4ed0a999db.
Merge branch 'master' into android_studio