"time stamp issue fixed"
Merge pull request #2428 from suryanarayanakb/1.2+Responsive-Ui

"time stamp issue fixed"
Merge pull request #2429 from ssushma/1.2+Responsive-Ui

Merged comments on off toggle issue from 6.6.3.a1 branch