From 82225c656de79e7d4bb8c1d47cc33dba7252beec Mon Sep 17 00:00:00 2001
From: Marko Savic <savicmarko1985@gmail.com>
Date: Mon, 23 Mar 2020 11:58:24 +0100
Subject: [PATCH] Merge changes from mobile v1.24.0 to master (#21041)