Merge "Separate blast sync for surface view from blast adapter"