Do not reset layer type when it is FORCE_FRAMEBUFFER am: e7759c7536
am: 8189283834

Change-Id: I0ee5fc85f95c330e26d8daf27a6def507a598e03