Merge "Tweak Memory use layout in Developer options" into sc-dev