Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more
Manual cherry picks of internal changes: - 9bb18bb9 - 67d6ba34 I've manually cherry picked them because the branches are substantially different, and the changes are dependant on each other. Change-Id: I63ba8b93f77d461dc1d01252805e0804ba678c43