When the Samsung Galaxy S6 and Galaxy S6 Edge first arrived in April, they were running Android Lollipop. Android Lollipop is the operating system that Google released back in November and the operating system that Samsung’s been rolling out to Galaxy devices since December.

Samsung’s Galaxy S6 and Galaxy S6 Edge will be running Lollipop for the foreseeable future even with its replacement, Android M, confirmed for arrival. Google’s not expected to release Android M until Q3 at the earliest which means that we’re still months and months away from Samsung’s Android M release.

In the meantime, the company is hard at work on an Android 5.1.1 update, a new version of Lollipop that will apparently be arriving for the Galaxy S6, Galaxy S6 Edge and Galaxy Note 4 at the very least. Samsung isn’t talking about Android 5.1.1 yet but we’re starting to get a solid read on its plans.

Galaxy S6 Android 5.1.1 Update

The Samsung Galaxy S6 Android 5.1.1 update was recently confirmed by Rogers though like Samsung, the carrier has been quiet about the update’s contents. Today, the curtain has been lifted as SamMobile is offering a glimpse at the Galaxy S6 Android 5.1.1 update, in the flesh, ahead of its release.

The site has leaked what it claims is an early build of Samsung’s Android 5.1.1 update for the Galaxy S6. The update that’s shown in the video below will apparently come to both the Galaxy S6 and Galaxy S6 Edge.

As expected, the Galaxy S6 Android 5.1.1 update will deliver a number of changes to the flagship smartphones. One of the biggest changes is the return of Guest Mode, a feature that will allow other users to use guest accounts instead of the administrator account. This feature is geared at those that often share their phone with friends and family.

The Galaxy S6 Android 5.1.1 update will also feature changes to Samsung’s camera application. Included is support for RAW and lower ISO values for the camera. It’s also expected to feature iOS-style exposure control that will allow users to manage their exposure with simple on-screen swipes.

Today’s video confirms a few other features. The site says that there is now a way to “disable the S Finder and Quick Connect buttons” right below the device’s quick settings menu.

There are also two other notable changes. Samsung has added a motion effect that offers a new twist on the home screen wallpaper and there is a small tweak to the Themes UI. Unfortunately, it’s still not clear what bug fixes will be on board though Android 5.1.1 comes with a number of fixes for Lollipop problems.

Samsung still hasn’t confirmed a release date for the Galaxy S6 Android 5.1.1 update though according to Rogers, the update will land for both the Galaxy S6 and Galaxy S6 Edge in June. Software release dates are always subject to change based on internal testing behind the scenes.

Samsung’s Android roll outs are also extremely random and unpredictable though they typically start with unbranded international models before shifting to carrier-branded variants in regions like the United States. US carriers are expected to push Android 5.1.1 updates to their versions of the Galaxy S6 though none have confirmed any details.

The company’s Android 5.1.1 update is expected to hit the Samsung Galaxy Note 4 in July though we still haven’t seen that update leak or any pertinent release details emerge. One thing is for sure though: The Galaxy S6 and Galaxy S6 Edge will get this update first.