Merge branch 'dev/removing-s5p6442' into for-next