am 740c7bdb: am 94759249: am f068c6e6: Merge "Low memory mode in UserHistory"

* commit '740c7bdbff0a81735c67e416aa148238bde268b5':