Always make a frame include itself in the context
Always make a frame include itself in the context

Change-Id: I25b93a54068d286e58bbe1451044840d016c522c

apmasell/flabbergast,flabbergast-config/flabbergast,flabbergast-config/flabbergast,flabbergast-config/flabbergast,apmasell/flabbergast,apmasell/flabbergast,apmasell/flabbergast,flabbergast-config/flabbergast,flabbergast-config/flabbergast,apmasell/flabbergast,apmasell/flabbergast