Merge "slideshow: Switch to android::uptimeMillis"