AOSP Fixes for l-preview