Merge branch 'master' into 'master'

Fix android policy UI not working

See merge request entgra/carbon-device-mgt-plugins!107

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-view/public/templates/android-policy-view.hbs

@@ -438,6 +438,7 @@
                     </div>
                 </div>
             </div>
+        </div>
         <!-- /passcode-policy -->
 
         <!-- camera -->
@@ -1242,7 +1243,7 @@
                 <div id="global-proxy-heading" class="panel-heading" role="tab">
                     <h2 class="sub-title panel-title">
                         Global Proxy Settings
-                        <label class="wr-input-control switch" data-toggle="collapse" data-target="#global-proxy-body">
+                        <label class="wr-input-control switch hidden" data-toggle="collapse" data-target="#global-proxy-body">
                             <input type="checkbox"/>
                             <span class="helper"></span>
                             <span class="text"></span>
@@ -2417,7 +2418,8 @@
                 <div id="always-on-vpn-heading" class="panel-heading" role="tab">
                     <h2 class="sub-title panel-title">
                         Always On VPN Settings
-                        <label class="wr-input-control switch" data-toggle="collapse" data-target="#always-on-vpn-body">
+                        <label class="wr-input-control switch hidden" data-toggle="collapse"
+                               data-target="#always-on-vpn-body">
                             <input type="checkbox"/>
                             <span class="helper"></span>
                             <span class="text"></span>