Bug 862952, Re-enable Composer2D after layers refactoring. r=bjacob,f=diego

--HG--
extra : rebase_source : eb394b6a7157b399d2e67baf695e9684835bbfcf