Change open session command so that the file argument is accessible via commands

Change-Id: Iaae3ce1e42f7e403f00b6eb09f228e49e4cf7f8e
Add support for custom shape in ShapeAnnotation

Change-Id: I9e84d8c476ced9b3ac5687d787ee9243cffdde50