[Mobile] Merge

Merged with master and resolved conflicts.

platform/commonUI/general/res/sass/_main.scss

@@ -38,7 +38,6 @@
 @import "fixed-position";
 @import "about";
 @import "text";
-@import "badges";
 @import "icons";
 @import "limits";
 @import "data-status";
@@ -54,7 +53,6 @@
 @import "edit/editor";
 @import "features/imagery";
 @import "features/time-display";
-@import "forms/mixins";
 @import "forms/elems";
 @import "forms/validation";
 @import "forms/text-input";
@@ -76,5 +74,7 @@
 @import "properties";
 @import "autoflow";
 @import "iframe";
+@import "messages";
 @import "initialization";
 @import "hide-non-functional";
+@import "views";