Fixed wso2/product-iots#1427

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-wizard/public/templates/android-policy-operations.hbs

@@ -485,7 +485,27 @@
                             </label>
                         </div>
                         <br>
-                        <div class="wr-input-control worker-profile-or-owner">
+                        <div class="device-owner">
+                            <ul class="message message-info device-owner">
+                                <i class="icon fw fw-info"></i>
+                                <a id="policy-listing-status-msg"> Below Restrictions are valid only when the Agent is
+                                    the
+                                    <b>device owner</b>.</a>
+                            </ul>
+                        </div>
+                        <br/>
+                            <div class="wr-input-control device-owner">
+                                <label class="wr-input-control checkbox">
+                                    <input id="disallow-SMS-enabled" type="checkbox" class="operationDataKeys"
+                                           data-key="disallowSMS"/>
+                                    <span class="helper" title="Users are restricted from sending SMS messages.">
+                                Disallow SMS
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                                </label>
+                            </div>
+                            <br>
+                            <div class="wr-input-control device-owner">
                                 <label class="wr-input-control checkbox">
                                     <input id="ensure-verifying-apps-enabled" type="checkbox" class="operationDataKeys"
                                            data-key="ensureVerifyApps"/>
@@ -496,7 +516,7 @@
                                 </label>
                             </div>
                             <br>
-                        <div class="wr-input-control worker-profile-or-owner">
+                            <div class="wr-input-control device-owner">
                                 <label class="wr-input-control checkbox">
                                     <input id="enable-auto-timing-enabled" type="checkbox" class="operationDataKeys"
                                            data-key="enableAutoTime"/>
@@ -507,7 +527,7 @@
                                 </label>
                             </div>
                             <br>
-                        <div class="wr-input-control worker-profile-or-owner">
+                            <div class="wr-input-control device-owner">
                                 <label class="wr-input-control checkbox">
                                     <input id="disable-screen-capture-enabled" type="checkbox" class="operationDataKeys"
                                            data-key="disableScreenCapture"/>
@@ -517,36 +537,6 @@
                             </span>
                                 </label>
                             </div>
-                        <div class="device-owner">
-                            <ul class="message message-info device-owner">
-                                <i class="icon fw fw-info"></i>
-                                <a id="policy-listing-status-msg"> Below Restrictions are valid only when the Agent is
-                                    the
-                                    <b>device owner</b>.</a>
-                                {{#unless isdeviceownerenabled}}
-                                    <p><i>Please change the configuration <b>'isDeviceOwnerEnabled'</b> to
-                                        <b>'true'</b> if you have enabled device owner for the agent.</i></p>
-                                {{/unless}}
-                            </ul>
-                        </div>
-                        <br/>
-                        <div
-                            {{#unless isdeviceownerenabled}}
-                            class="testing" title="Please change the configuration 'isDeviceOwnerEnabled' to
-                         'true' if you have enabled device owner for the agent."
-                            {{/unless}}
-                        >
-                            <div class="wr-input-control device-owner">
-                                <label class="wr-input-control checkbox">
-                                    <input id="disallow-SMS-enabled" type="checkbox" class="operationDataKeys"
-                                           data-key="disallowSMS"/>
-                                    <span class="helper" title="Users are restricted from sending SMS messages.">
-                                Disallow SMS
-                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
-                            </span>
-                                </label>
-                            </div>
-                            <br>
                             <div class="wr-input-control device-owner">
                                 <label class="wr-input-control checkbox">
                                     <input id="volume-adjust-enabled" type="checkbox" class="operationDataKeys"