More work on porting watch face to android 5.0