Merge "Adding WINDOW_MANAGER_NATIVE_BOOT and window_manager_use_blast_adapter flags"