Merged with [Android] Completed URBNG-357, URBNG-358, URBNG-359 from URBNG-55