Merge branch 'work/old-omapfb-removal'