Revert "Merge branch 'master' into fav_sharedpref_steph"

This reverts commit 4be39c45b019b84b7a8eb090a271126a9124025e, reversing
changes made to 63120b6ae2761c95d686ce21fd5ca2824208f81a.
commit with user background