Improve progressiveEnhancement to support inline Handlebars content

Change-Id: I2058023b266f95a3d45e34347b5a7705f510f34d
Merge "Improve progressiveEnhancement to support inline Handlebars content"