Merge "make sure we have a context when creating the 1st surface" into klp-dev