Merge "Set forceFramework correctly for included layouts." into lmp-dev